Shiptest Oct 16 - Oct 29 #60
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request You can now throw things from behind flipped tables. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game You would think that being adjacent to a supposedly defensive thing would at least let you throw things over it. Like sandbags. Or barricades. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: Flipped tables actually let you throw things over them now. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request as title <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game As funny as it is I think it's kinda mean to have a trap item just. Right there <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: del: South Bronx Paradise Bar /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Fixes a few harddels that surfaced in PR shiptest-ss13#3558 ## Why It's Good For The Game Harddels are still just terrible wastes of time ## Changelog :cl: /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Adds a new ruin, the Ice Lodge! Formerly an SRM settlement, Frontiersmen have since come in and taken it over for their own use. <details> <summary>Screenshots (Updated as of 05/09)</summary> <br>    </details> Adds two new Frontiersmen mobs based off the new roles, flametroopers and surgeons. Flametroopers will rush enemies and spray fire at their enemies. Surgeons will fire syringes and attempt to sedate their enemies. Modifies fireline code to support igniting tiles as an option. Adds a var to hostile mob AI, shoot_point_blank. If enabled ranged mobs can shoot their guns at melee range instead of melee attacking if possible. Deletes the cat butcher since the Surgeon fills the same niche and being much less questionable. Fences no longer call update fence status on initialize. All this did was make closed fence doors spawn open and open fence doors spawn closed. Adds gunpowder barrels, broken display cases and random chemical jug spawners, SRM corpse spawners for use in the ruin. Adds a var for bullets, grown items, and nutrient bottles (auto_scatter) so you can choose whether they scatter on initialize. Fixes the pathing for some internals pathed frontiersmen simple mobs. ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> New ruins are good and the new frontiersmen simple mobs will hopefully diversify the enemy roster nicely. The cat butcher is cruft, and won't be missed. ## Changelog :cl: add: Ice Lodge Ruin Map and areas add: Simple Mob Frontiersmen Flametrooper and Surgeon add: shoot_point_blank option for simple mobs add: dragon_fire_line supports igniting tiles add: broken display case, gunpowder barrel, SRM corpse spawners, chemical jug spawners del: Cat Butcher fix: Frontiersmen simplemob pathing fix: Fence doors spawning open when they should be closed and vice versa code: scattering can be disabled with auto_scatter var for bullets, grown items and nutrient bottles /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: Theos <[email protected]> Co-authored-by: Theos <[email protected]>
## About The Pull Request Someone commented out something to try and see why something was broken and left it. Digi isn't broken either so I'm not sure how this happened. Also removes partial-insulation from the Gezenan captain's gloves that Apogee happened to forget. ## Why It's Good For The Game It's too early in the day for the marines to get silly like this. ## Changelog :cl: fix: Gezena has shoes again del: Gezenan captain gloves no longer have partial insulation in parity with other captain gloves. /:cl:
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Fixes the caliber strings on the beanbag, rubber, improvised and incendiary shotgun rounds and shotguns being unable to load them as a consequence. Magazines check for an exact caliber match, so having unique strings like "12ga beanbag" means the round gets rejected. ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> Fixes are good ## Changelog :cl: fix: Shotgun calibers and shotguns being unable to load certain rounds /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Look upon my works ye mighty, and despair.  This PR notably removes the woefully underused and really badly sprited rainbow jumpsuit I did three years ago, as well as a mediocre reference to Fight Club. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Better sprites! <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: PositiveEntropy imageadd: All colored jumpsuits have been resprited! del: Rainbow and khaki jumpsuits (including the buster subtype) have been removed. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
## About The Pull Request (PR'ing the right branch this time) Resprites many dresses, and adds many more. Specifically: Resprites all the colored skirts, black tango, red evening gown, sailors dress (reflavored to be Solarian), sundress, striped dress, white dress, and some suitskirts. Adds an extra colored skirt, a pinafore with five other variants, a one shoulder dress, and a Kalixcian dress.  ## Why It's Good For The Game Your branch: Crusty, crufty, ugly  My branch: Cute, pretty, full of beauty  ## Changelog :cl: imageadd: Resprites colored skirts, black tango, red evening gown, sailors dress, sundress, white dress, and some suitskirts. add: Six pinafore variants, white colored skirt, one shoulder dress, and iko-ikssoal dress. /:cl:
This pull request updates the TGS DMAPI to the latest version. Please note any breaking or unimplemented changes before merging. Co-authored-by: github-actions <[email protected]>
…t-ss13#3577) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Buff to jump boots and kepori trying to make the beef jump ## Why It's Good For The Game im. over the lava.i m oiver it. it cant touch me. because im. not in it. ## Changelog :cl: balance: being thrown over lava by tackling, jump boots, or with assistance now fully clears the lava instead of burning you horribly and setting you on fire /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.3.1 to 2.5.4. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/cure53/DOMPurify/releases">dompurify's releases</a>.</em></p> <blockquote> <h2>DOMPurify 2.5.4</h2> <ul> <li>Fixed a bug with latest <code>isNaN</code> checks affecting MSIE, thanks <a href="https://github.com/tulach"><code>@tulach</code></a></li> <li>Fixed the tests for MSIE and fixed related test-runner</li> </ul> <h2>DOMPurify 2.5.3</h2> <ul> <li>Fixed several mXSS variations found by and thanks to <a href="https://github.com/kevin-mizu"><code>@kevin-mizu</code></a> & <a href="https://github.com/Ry0taK"><code>@Ry0taK</code></a></li> <li>Added better configurability for comment scrubbing default behavior</li> <li>Added better hardening against Prototype Pollution attacks, thanks <a href="https://github.com/kevin-mizu"><code>@kevin-mizu</code></a></li> <li>Fixed some smaller issues in README and other documentation</li> </ul> <h2>DOMPurify 2.5.2</h2> <ul> <li>Addressed and fixed a mXSS variation found by <a href="https://github.com/kevin-mizu"><code>@kevin-mizu</code></a></li> <li>Addressed and fixed a mXSS variation found by <a href="https://twitter.com/hash_kitten">Adam Kues</a> of Assetnote</li> <li>Updated tests for older Safari and Chrome versions</li> </ul> <h2>DOMPurify 2.5.1</h2> <ul> <li>Fixed an mXSS sanitizer bypass reported by <a href="https://github.com/icesfont"><code>@icesfont</code></a></li> <li>Added new code to track element nesting depth</li> <li>Added new code to enforce a maximum nesting depth of 255</li> <li>Added coverage tests and necessary clobbering protections</li> </ul> <p><strong>Note that this is a security release and should be upgraded to immediately. Please also note that further releases may follow as the underlying vulnerability is apparently new and further variations may be discovered.</strong></p> <h2>DOMPurify 2.5.0</h2> <ul> <li>Added new setting <code>SAFE_FOR_XML</code> to enable better control over comment scrubbing</li> <li>Updated the LICENSE file to show the accurate year number</li> <li>Updated several build and test dependencies</li> </ul> <h2>DOMPurify 2.4.9</h2> <ul> <li>Fixed another conditional bypass caused by Processing Instructions, thanks <a href="https://github.com/Ry0taK"><code>@Ry0taK</code></a></li> <li>Fixed the regex for HTML Custom Element detection, thanks <a href="https://github.com/AlekseySolovey3T"><code>@AlekseySolovey3T</code></a></li> </ul> <h2>DOMPurify 2.4.8</h2> <ul> <li>Fixed two possible bypasses when sanitizing an XML document and later using it in HTML, thanks <a href="https://github.com/Slonser"><code>@Slonser</code></a></li> </ul> <h2>DOMPurify 2.4.7</h2> <ul> <li>Fixed a licensing issue spotted and reported by <a href="https://github.com/george-thomas-hill"><code>@george-thomas-hill</code></a></li> </ul> <h2>DOMPurify 2.4.6</h2> <ul> <li>Fixed a bypass in jsdom 22 in case the <code>noframes</code> element is permitted, thanks <a href="https://github.com/leeN"><code>@leeN</code></a></li> </ul> <h2>DOMPurify 2.4.5</h2> <ul> <li>Fixed a problem with improper reset of custom HTML options, thanks <a href="https://github.com/ammaraskar"><code>@ammaraskar</code></a></li> </ul> <h2>DOMPurify 2.4.4</h2> <ul> <li>Added support for <code>ALLOW_SELF_CLOSE_IN_ATTR</code> flag, thanks <a href="https://github.com/edg2s"><code>@edg2s</code></a> <a href="https://github.com/AndreVirtimo"><code>@AndreVirtimo</code></a></li> <li>Added better support for <code>shadowrootmode</code>, thanks <a href="https://github.com/mfreed7"><code>@mfreed7</code></a></li> </ul> <h2>DOMPurify 2.4.3</h2> <ul> <li>Final release that is compatible with MSIE10 & MSIE 11</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/cure53/DOMPurify/commit/10c12610b15875ea09129c35fca28a886857434f"><code>10c1261</code></a> docs: Updated README ever so slightly</li> <li><a href="https://github.com/cure53/DOMPurify/commit/1c9288095c41f48c1a5dcfda72f615320b27b3ad"><code>1c92880</code></a> test: Fixed two more tests for MSIE11 and Edge 18</li> <li><a href="https://github.com/cure53/DOMPurify/commit/14012082720e48f7f9134d3c53f280ba4dba2058"><code>1401208</code></a> test: Fixed more tests for MSIE and Edge 18</li> <li><a href="https://github.com/cure53/DOMPurify/commit/2c6410a637eae71a51b2fa6d8cdd2bde7b2aa125"><code>2c6410a</code></a> test: Fixed several new tests for MSIE11 and Edge 18</li> <li><a href="https://github.com/cure53/DOMPurify/commit/2c9bca957c28bb73ecc9544cea379e41963276c4"><code>2c9bca9</code></a> test: Changed github config to include MSIE tests for 2.x</li> <li><a href="https://github.com/cure53/DOMPurify/commit/b188787889deb66eb3b0c73b857e77e889ee9912"><code>b188787</code></a> chore: Preparing 2.5.4 release</li> <li><a href="https://github.com/cure53/DOMPurify/commit/707b3d682451b69c003c4ecb363550b93ef595a9"><code>707b3d6</code></a> fix: Added a better for for the MSIE iNaN issue</li> <li><a href="https://github.com/cure53/DOMPurify/commit/62fe3be09ad4dca4ff8671272baf15f512872b5e"><code>62fe3be</code></a> test: Attempting to get MSIE 11 back into the browser test array</li> <li><a href="https://github.com/cure53/DOMPurify/commit/f3a97107b29e6af78884e05a63638622eddb6df6"><code>f3a9710</code></a> fix: Fixed an issue with MSIE and no support for Number.isNaN</li> <li><a href="https://github.com/cure53/DOMPurify/commit/e1ddfc7b5e6d6599c369f826699b0204e2c691b9"><code>e1ddfc7</code></a> Merge branch '2.x' of github.com:cure53/DOMPurify into 2.x</li> <li>Additional commits viewable in <a href="https://github.com/cure53/DOMPurify/compare/2.3.1...2.5.4">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/shiptest-ss13/Shiptest/network/alerts). </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request   The Atlas-class is the first Colonial League ship following the CLIP Rework. The decaling and general decoration of the ship needs a revision, but otherwise, it is intended as a small, overall generalist patrol vessel to the likes of the Vaquero. The 4-Minutemen team, lead by one Sergeant, is subordinate to the First Officer and Captain, who overlook the operation of the ship by the Corpsman and the Engineer. It is staffed by: * 1 Captain * 1 First Officer * 1 Sergeant * 1 Corpsman * 1 Engineer * 4 Minutemen * 1 Deckhand <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game it's the clip ship it uses the colon league content <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: Atlas-class Light Armored Crusier /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: rye-rice <[email protected]> Signed-off-by: meem <[email protected]> Co-authored-by: rye-rice <[email protected]>
…s the armory (shiptest-ss13#3477) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Removes an extra turret that found it's way onto the hull of the PGF Crying Sun, likely in the recent PGF turret overhaul. Additionally, a locker in the armory has been renamed and the flashbangs have been moved from the Marine equipment locker to the Lieutenant's ordnance locker. I've attached an image below to show how it's now organized.    <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Ships having automated turrets that they weren't meant to have is generally a bad thing for balance and being able to enjoy the ship's lovingly labored over design. As for the flashbangs, the ship's fragmentation and smoke grenades were already being controlled by the lieutenant so it seems logical to do the same with grenades that can blind and deafen someone. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: del: Removed extra turret that wasn't supposed to be on the ship fix: Moved armory flashbangs to a more secure location /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
## About The Pull Request Fixes a typo that broke the sprite whenever you took the hat off or flipped it ## Why It's Good For The Game Fixes good ## Changelog :cl: fix: Fixed a typo in the Frontiersman softcap that made the sprite go invisible /:cl:
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request removes welding fuel tanks from the wasteplanet spawn pool <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game you will explode... less.. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: del: Wasteplanets no longer spawn welding fuel tanks. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> Co-authored-by: Erika Fox <[email protected]>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request title Was meant to be apart of another big manufacturer PR, however I do those when i'm taking a break from big projects, so its a bit of a cycle. It appears im in the latter half of the cycle (overmap 5 coming december...), so might as well just PR what i have done ## Why It's Good For The Game  ## Changelog :cl: add: Resprites the commander and Commissioner /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: rye-rice <[email protected]> Co-authored-by: retlaw34 <[email protected]> Co-authored-by: thgvr <[email protected]>
…emap Expansion #5 (shiptest-ss13#3627) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request This removes a substantial amount of bullshit from atmospherics, like the 3 made up gases that only served for powergaming purposes. This PR instead replaces them with much more fitting IRL gases seen in irl planets such as: - Argon - Carbon Monoxide - Sulfur Dioxide - Ammonia - Metane - Ozone Argon in particular inherits the fire suppression behavior from noble gas, HOWEVER, the threshold to stop reactions has been increased from 10 mols to 75 mols. this should pose an suffocation hazard The values to atmos fires have been tweaked, some gases that had no entaphy now have it This PR also adds a very basic chemical odor system, to detect certain gases based on smell, in case you don't have an atmos analyzer on you, and also to get you to actually siphon trace amounts of gases because they stink up the place in case of a breach ## Why It's Good For The Game removes cruft, replaces it with actual, fun, non-powergamey stuff that will be used soon:tm: and also has the potential to have a bunch of fun and realistic interactions when someone more familiar with this stuff than me codes it. For example outside of planetary gases, some ideas I had were: - Sparks creating ozone - Ammonia and chlorine mixing creating "snow" (Ammonium chloride) so a leak of both gases would cover the floor with snow, this sounds like a fun reaction to scare the shit out of people - smarter people like @Thera-Pissed would probably know more what to do ## Changelog :cl: add: You can now detect certain gases from smell, most notably plasma add: Adds 6 new gases, all unused at the moment del: 3 gases, Pluox, Nitryl, and Stimming balance: The noble gas suppresssion threshold has been increased from 10 mols to 75 mols balance: Various gases have had their enthalpy (energy released during fires) adjusted, changing the behavior of gas fires slightly. balance: Plasma is a much more potent skin/eye irritant balance: Hydrogen gas is no longer visible fix: Freon's stage one breath effects should work now, before they were tied to nitryl's amount /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Co-authored-by: retlaw34 <[email protected]> Co-authored-by: Erika Fox <[email protected]>
… it (shiptest-ss13#3638) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request yeah ## Why It's Good For The Game saves 2 lines ## Changelog :cl: code: empty energy weapons now get emptied slightly differently, no player-facing changes /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> Signed-off-by: Theos <[email protected]>
github-actions
bot
added
Code Change
Map Change
Dependencies
DME Edit
Sprites
Sound
tgui
Github
labels
|
you the mvp. ill look into what i want to revert here and tweak it for Friday |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: TDHooligan <[email protected]>
This reverts commit de5b708.
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Going to close this one out for the moment and clean up locally before opening a new PR. I'll make sure to remove that Kepori change in the redo as well. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
All I can say is that after a bit of conflict resolution, the server starts and the new ships (Atlas, Scarab, Raleigh) spawn without barfing.
Someone review the commit names as part of the PR and shout if there's any that we should revert before merging (example, there's one "Disables the Komodo" that I don't know if anyone would be sad about)
Why It's Good For The Game
Keeping up with the
Jonesshiptest